a11y: Remove destroy_count_func usage

It's not needed anymore.

diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c
index 7a910864511fac3242a664099e83ee4daab7af7c..e14fd3487e5907505c365fef8ce6429401cda5c7 100644 (file)
--- a/gtk/a11y/gtktreeviewaccessible.c
+++ b/gtk/a11y/gtktreeviewaccessible.c
@@ -58,11 +58,6 @@ static void     cursor_changed       (GtkTreeView      *tree_view,
 static gboolean focus_in             (GtkWidget        *widget);
 static gboolean focus_out            (GtkWidget        *widget);
 
-static void     destroy_count_func   (GtkTreeView      *tree_view,
-                                      GtkTreePath      *path,
-                                      gint              count,
-                                      gpointer          user_data);
-
 /* Misc */
 
 static void             set_iter_nth_row                (GtkTreeView            *tree_view,
@@ -209,7 +204,6 @@ gtk_tree_view_accessible_initialize (AtkObject *obj,
 
   accessible = GTK_TREE_VIEW_ACCESSIBLE (obj);
   accessible->focus_cell = NULL;
-  accessible->n_children_deleted = 0;
 
   accessible->cell_infos = g_hash_table_new_full (cell_info_hash,
       cell_info_equal, NULL, (GDestroyNotify) cell_info_free);
@@ -242,10 +236,6 @@ gtk_tree_view_accessible_initialize (AtkObject *obj,
       else
         obj->role = ATK_ROLE_TREE_TABLE;
     }
-
-  gtk_tree_view_set_destroy_count_func (tree_view,
-                                        destroy_count_func,
-                                        NULL, NULL);
 }
 
 static void
@@ -1535,7 +1525,6 @@ row_collapsed_cb (GtkTreeView *tree_view,
 
   /* Set collapse state */
   set_expand_state (tree_view, tree_model, accessible, path, FALSE);
-  accessible->n_children_deleted = 0;
   return FALSE;
 }
 
@@ -1795,35 +1784,6 @@ model_row_deleted (GtkTreeModel *tree_model,
       set_expand_state (tree_view, tree_model, accessible, path_copy, TRUE);
       gtk_tree_path_free (path_copy);
     }
-
-  accessible->n_children_deleted = 0;
-}
-
-/* This function gets called when a row is deleted or when rows are
- * removed from the view due to a collapse event. Note that the
- * count is the number of visible *children* of the deleted row,
- * so it does not include the row being deleted.
- *
- * As this function is called before the rows are removed we just note
- * the number of rows and then deal with it when we get a notification
- * that rows were deleted or collapsed.
- */
-static void
-destroy_count_func (GtkTreeView *tree_view,
-                    GtkTreePath *path,
-                    gint         count,
-                    gpointer     user_data)
-{
-  AtkObject *atk_obj;
-  GtkTreeViewAccessible *accessible;
-
-  atk_obj = gtk_widget_get_accessible (GTK_WIDGET (tree_view));
-  accessible = GTK_TREE_VIEW_ACCESSIBLE (atk_obj);
-
-  if (accessible->n_children_deleted != 0)
-    return;
-
-  accessible->n_children_deleted = count;
 }
 
 void

diff --git a/gtk/a11y/gtktreeviewaccessible.h b/gtk/a11y/gtktreeviewaccessible.h
index ddc0cfddf5ee9027f89fe645cd7cbdbd8b465373..677eb3b8af3d0b731b4fbd26e44997a6294f8df6 100644 (file)
--- a/gtk/a11y/gtktreeviewaccessible.h
+++ b/gtk/a11y/gtktreeviewaccessible.h
@@ -39,7 +39,6 @@ struct _GtkTreeViewAccessible
 {
   GtkContainerAccessible parent;
 
-  gint           n_children_deleted;
   GHashTable    *cell_infos;
   GtkTreeModel  *tree_model;
   AtkObject     *focus_cell;